164. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:59 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

164.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/Header	Type.php	2019-11-29 02:10:56 +0000
2	/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/Header	Type.php	2021-04-23 07:16:04 +0000

164.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	5	54
Changed	4	72
Inserted	0	0
Removed	0	0

164.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

164.4 Active regular expressions

No regular expressions were active.

164.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Porto\Model\Config\Settings\Header;	2	namespace Smartwave\Porto\Model\Config\Settings\Header;
3		3
4	class Type implements \Magento\Framework\Option\ArrayInterface	4	class Type implements \Magento\Framework\Option\ArrayInterface
5	{	5	{
6	public function toOptionArray()	6	public function toOptionArray()
7	{	7	{
8	return [	8	return [
9	['value' => '1', 'label' => __('Type 1')],	9	['value' => '1', 'label' => __('Type 1')],
10	['value' => '2', 'label' => __('Type 2')],	10	['value' => '2', 'label' => __('Type 2')],
11	['value' => '3', 'label' => __('Type 3')],	11	['value' => '3', 'label' => __('Type 3')],
12	['value' => '4', 'label' => __('Type 4')],	12	['value' => '4', 'label' => __('Type 4')],
13	['value' => '5', 'label' => __('Type 5')],	13	['value' => '5', 'label' => __('Type 5')],
14	['value' => '6', 'label' => __('Type 6')],	14	['value' => '6', 'label' => __('Type 6')],
15	['value' => '7', 'label' => __('Type 7')],	15	['value' => '7', 'label' => __('Type 7')],
16	['value' => '8', 'label' => __('Type 8')],	16	['value' => '8', 'label' => __('Type 8')],
17	['value' => '9', 'label' => __('Type 9')],	17	['value' => '9', 'label' => __('Type 9')],
18	['value' => '10', 'label' => __('Type 10')],	18	['value' => '10', 'label' => __('Type 10')],
19	['value' => '11', 'label' => __('Type 11')],	19	['value' => '11', 'label' => __('Type 11')],
20	['value' => '12', 'label' => __('Type 12')],	20	['value' => '12', 'label' => __('Type 12')],
21	['value' => '13', 'label' => __('Type 13')],	21	['value' => '13', 'label' => __('Type 13')],
22	['value' => '14', 'label' => __('Type 14')],	22	['value' => '14', 'label' => __('Type 14')],
23	['value' => '15', 'label' => __('Type 15')],	23	['value' => '15', 'label' => __('Type 15')],
24	['value' => '16', 'label' => __('Type 16')],	24	['value' => '16', 'label' => __('Type 16')],
25	['value' => '17', 'label' => __('Type 17')],	25	['value' => '17', 'label' => __('Type 17')],
26	['value' => '18', 'label' => __('Type 18')],	26	['value' => '18', 'label' => __('Type 18')],
27	['value' => '19', 'label' => __('Type 19')],	27	['value' => '19', 'label' => __('Type 19')]
28	['value' => '20', 'label' => __('Type 20')],
29	['value' => '21', 'label' => __('Type 21')],
30	['value' => '22', 'label' => __('Type 22')],
31	['value' => '23', 'label' => __('Type 23')],
32	['value' => '24', 'label' => __('Type 24')],
33	['value' => '25', 'label' => __('Type 25')],
34	['value' => '26', 'label' => __('Type 26')],
35	['value' => '27', 'label' => __('Type 27')]
36	];	28	];
37	}	29	}
38		30
39	public function toArray()	31	public function toArray()
40	{	32	{
41	return [	33	return [
42	'1' => __('Type 1'),	34	'1' => __('Type 1'),
43	'2' => __('Type 2'),	35	'2' => __('Type 2'),
44	'3' => __('Type 3'),	36	'3' => __('Type 3'),
45	'4' => __('Type 4'),	37	'4' => __('Type 4'),
46	'5' => __('Type 5'),	38	'5' => __('Type 5'),
47	'6' => __('Type 6'),	39	'6' => __('Type 6'),
48	'7' => __('Type 7'),	40	'7' => __('Type 7'),
49	'8' => __('Type 8'),	41	'8' => __('Type 8'),
50	'9' => __('Type 9'),	42	'9' => __('Type 9'),
51	'10' => __('Type 10'),	43	'10' => __('Type 10'),
52	'11' => __('Type 11'),	44	'11' => __('Type 11'),
53	'12' => __('Type 12'),	45	'12' => __('Type 12'),
54	'13' => __('Type 13'),	46	'13' => __('Type 13'),
55	'14' => __('Type 14'),	47	'14' => __('Type 14'),
56	'15' => __('Type 15'),	48	'15' => __('Type 15'),
57	'16' => __('Type 16'),	49	'16' => __('Type 16'),
58	'17' => __('Type 17'),	50	'17' => __('Type 17'),
59	'18' => __('Type 18'),	51	'18' => __('Type 18'),
60	'19' => __('Type 19'),	52	'19' => __('Type 19')
61	'20' => __('Type 20'),
62	'21' => __('Type 21'),
63	'22' => __('Type 22'),
64	'23' => __('Type 23'),
65	'24' => __('Type 24'),
66	'25' => __('Type 25'),
67	'26' => __('Type 26'),
68	'27' => __('Type 27')
69	];	53	];
70	}	54	}
71	}	55	}